From 12249b21d1a360c21e064393f497e3a70531c781 Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Thu, 3 Sep 2020 08:43:55 +0100
Subject: [PATCH] javadoc-optional

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gbp-Pq: Name javadoc-optional.diff
---
 Repository.mk             |   2 +-
 configure.ac              | Bin 483284 -> 484012 bytes
 odk/CustomTarget_check.mk |   2 +-
 odk/Module_odk.mk         |   6 ++++--
 odk/util/check.pl         |   2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Repository.mk b/Repository.mk
index 38fd2475e20..0718b51c8db 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -865,7 +865,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\
 	offapi_idl \
 	udkapi_idl \
 	$(if $(ENABLE_JAVA), \
-		odk_javadoc \
+		$(if $(JAVADOC),odk_javadoc) \
 		odk_uno_loader_classes \
 		odk_unowinreg \
 	) \
diff --git a/configure.ac b/configure.ac
index 97018aac05e736b83b0790c057e626ba4323388a..c41fe45815e0829054d615df35a5c009866497f4 100644
GIT binary patch
delta 570
zcmY+BPe>b45XO0Vv&m-Z+w~7d#fa;s&00{XD3nqHN(*8xT7(`dA*OM~SV=5NE1vXX
zE!cywwBM=Vtwl-^TJY9fTBWxfT4+ltIrN-}2!$M^FKZ0=V0gpu`@Ugjz7>1led*o!
z$j)qCGv%9IN<B@@=h6xH-ir==j<VK)i^`w}c+kv>lg=z;oV;0Bbj${Th|O$@OFgD+
z771LG*K8JUmb>x6X4k<VuzuvaSzD9(9c9rzuR~(+ywmJzrm&c7xWv|+d}6C=Ga0^v
zs?B%*wwOaH)4J+pQxBJ&WN!WuhQ3lC_TTswlq<Xo)wd*2I^~2zL2X#Id;+_l6cuHr
z1hA7P;&M_v-eh5%UZD|01dU?v7Z;clbPYS)N7xk7bMKi%ia$wf+J&&4q!7w6uHm1c
zP8=Wc5W+eQ<M}kTyDK{3xJH`09*nqSLPg~VSJ6|G-mi4JftE?1ibI|Hv2@0Ja8eh3
zSE$Q<ud6Tj$&XtG-9(X*in*GcpkPo3jw-AjV}F=38myn;NjC2k%=q~I@w-!ZwBSO<
zTc7-#<-FtNmk4YdG%(!2Cub(&Qe~Mj(~_&TZr3lF)q<B4n)K4}dLm$Nl?;-h$nYPO
Ii~vpl2ggaaN&o-=

delta 207
zcmZ2;RQAe#*@i8Q|J2*(Ycc{c)AsqA%oCqXPjF@Dp1wAiiF5jgD?q~M8?)y0UOpE2
z>GQuavrd1^$D%h~l%K_5I`?;Gq3O~5EHcv{aI>&Xujglxo*wm`S!8-cA`92_1N<yf
z)3aYP@=X`uVG*4EkDo<&`iGfpeACqhSPZAn_`)JMxt>#bdfYQcj_GRzSZpDNd=+4k
zovy&k!av<mkVSWT`cFoI>2-oY*~5Y?lGDW(u<}ng6=IQY?-pVKVpbq#+ukk2t{4CS
Dtp`KP

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index b9dc8d35807..d3b8fc31109 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -35,7 +35,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
 		$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_config_win)) \
 		$(call gb_Package_get_target,odk_docs) \
 		$(call gb_Package_get_target,odk_html) \
-		$(if $(ENABLE_JAVA),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
+		$(if $(JAVADOC),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
 		$(call gb_Package_get_target,odk_settings) \
 		$(call gb_Package_get_target,odk_settings_generated) \
 		$(if $(ENABLE_JAVA),$(call gb_Package_get_target,odk_unowinreg))
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 410f8cf8ef1..363a8a41dea 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -43,11 +43,13 @@ ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_targets,odk,\
 	$(if $(and $(BUILD_UNOWINREG),$(filter GCC,$(COM))),CustomTarget_unowinreg)\
 	CustomTarget_classes \
-	CustomTarget_javadoc \
-	GeneratedPackage_odk_javadoc \
 	GeneratedPackage_uno_loader_classes \
 	$(if $(filter WNT,$(OS)),Library_unowinreg) \
 	Package_unowinreg \
+	$(if $(JAVADOC),\
+		CustomTarget_javadoc \
+		GeneratedPackage_odk_javadoc \
+	) \
 ))
 endif
 
diff --git a/odk/util/check.pl b/odk/util/check.pl
index be03d40ff58..bed51e1c7a6 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -184,7 +184,7 @@ if (-d "$SdkDir") {
     # improvement required
     my $solar_java = $ENV{"ENABLE_JAVA"};
     my $JDK = $ENV{"JDK"};
-    if (defined($solar_java) && $solar_java ne "" && (!defined($JDK) || $JDK ne "gcj")) {
+    if (defined($solar_java) && $solar_java ne "" && $ENV{"JAVADOC"} ne "") {
     print "check java docu: ";
     if (check_dir("docs/java/ref")) {
         if (!check_file("docs/java/ref/index.html")) {
-- 
2.30.2